[ioemu] Revert 14585:3375391fb0c9 since this removes useful functionality.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>

diff --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target
index becb331238c41a36e69e406c3abd0ec909a65e3f..4872128d20da4288f9514a50978d10d1ca02bae8 100644 (file)
--- a/tools/ioemu/Makefile.target
+++ b/tools/ioemu/Makefile.target
@@ -193,10 +193,6 @@ ifdef CONFIG_SOLARIS
 LIBS+=-lsocket -lnsl -lresolv
 endif
 
-ifeq ($(debug),y)
-CFLAGS += -DQEMU_VNC_MONITOR_EXPORT
-endif
-
 # profiling code
 ifdef TARGET_GPROF
 LDFLAGS+=-p

diff --git a/tools/ioemu/vnc.c b/tools/ioemu/vnc.c
index ac3b43351cd581dcfc87fe7687f6908ba6e20af4..d06b47a220fce74097ef4cc5e6485945d704fdc3 100644 (file)
--- a/tools/ioemu/vnc.c
+++ b/tools/ioemu/vnc.c
@@ -113,10 +113,8 @@ struct VncState
     int visible_w;
     int visible_h;
 
-#ifdef QEMU_VNC_MONITOR_EXPORT
     int ctl_keys;               /* Ctrl+Alt starts calibration */
     int shift_keys;             /* Shift / CapsLock keys */
-#endif
     int numlock;
 };
 
@@ -897,7 +895,6 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
            kbd_put_keycode(keycode & 0x7f);
        else
            kbd_put_keycode(keycode | 0x80);
-#ifdef QEMU_VNC_MONITOR_EXPORT
     } else if (down) {
        int qemu_keysym = 0;
 
@@ -925,10 +922,8 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
        }
        if (qemu_keysym != 0)
            kbd_put_keysym(qemu_keysym);
-#endif
     }
 
-#ifdef QEMU_VNC_MONITOR_EXPORT
     if (down) {
        switch (sym) {
        case XK_Control_L:
@@ -981,10 +976,6 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
            break;
        }
     }
-#else
-    if (!down && sym == XK_Num_Lock)
-        vs->numlock = !vs->numlock;
-#endif
 }
 
 static void key_event(VncState *vs, int down, uint32_t sym)